diff --git a/.cz-config.js b/.cz-config.js
new file mode 100644
index 0000000000000000000000000000000000000000..120a1d4851bbf8dde3ae393d5a1603ba66b887c1
--- /dev/null
+++ b/.cz-config.js
@@ -0,0 +1,49 @@
+'use strict';
+
+module.exports = {
+
+  types: [
+    {value: 'Feat',     name: 'feat:     A new feature'},
+    {value: 'Git',      name: 'git:      changes to Git files'},
+    {value: 'Fix',      name: 'fix:      A bug fix'},
+    {value: 'Docs',     name: 'docs:     Documentation only changes'},
+    {value: 'Style',    name: 'style:    Changes that do not affect the meaning of the code\n            (white-space, formatting, etc)'},
+    {value: 'Refactor', name: 'refactor: A code change that neither fixes a bug nor adds a feature'},
+    {value: 'Perf',     name: 'perf:     A code change that improves performance'},
+    {value: 'Test',     name: 'test:     Adding missing tests or correcting existing tests'},
+    {value: 'Build',    name: 'build:    Changes that affect the build system or external dependencies (example scopes: maven, gradle, npm, gulp)'},
+    {value: 'CI',       name: 'ci:       Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)'},
+    {value: 'Chore',    name: 'chore:    Other changes that dont modify src or test files'},
+    {value: 'Revert',   name: 'revert:   Reverts a previous commit'}
+  ],
+
+  scopes: [
+    {name: 'other'}
+  ],
+
+  scopeOverrides: {
+    build: [
+      {name: 'dependencies'},
+      {name: 'versioning'},
+      {name: 'release'},
+      {name: 'build plugin'}
+    ],
+    ci: [
+      {name: 'script'}
+    ],
+    chore: [
+      {name: 'commitizen'},
+      {name: 'editorconfig'},
+      {name: 'git'}
+    ],
+    docs: [
+      {name: 'API docs'},
+      {name: 'repo'},
+      {name: 'maven'}
+    ]
+  },
+
+  allowCustomScopes: true,
+  allowBreakingChanges: ['feat', 'fix', 'docs', 'style', 'refactor', 'perf', 'test', 'build', 'ci', 'chore', 'revert']
+
+};
diff --git a/.cz.json b/.cz.json
new file mode 100644
index 0000000000000000000000000000000000000000..d4856e0f01c0fd7a73d9905a6c4e1d4c440464d6
--- /dev/null
+++ b/.cz.json
@@ -0,0 +1 @@
+{ "path": "cz-customizable" }
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000000000000000000000000000000000..27f6865af138bc89bb7e578d13f606b2611d0e15
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,14 @@
+# top-most EditorConfig file
+root = true
+
+[*]
+#unix style line ending
+end_of_line = lf
+#newline at end of file
+insert_final_newline = true
+#charset UTF-8
+charset = utf-8
+#indent using spaces
+indent_style = space
+#4 spaces per indent
+indent_size = 4
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000000000000000000000000000000000..456e49e990094033c42c86cedc1801edd2d3d159
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,4 @@
+* eol=lf
+*.bat eol=crlf
+*.sh eol=lf
+.git* export-ignore
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8db0f32b2a8b7d9a0616fe4dcb906eef7117ea90..1ef154b4e1efa6b37cd5cbc67682beb3ae4a45c1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,13 +6,19 @@ cache:
 
 test:
   services:
-    - name: janusgraph/janusgraph:latest
+    - name: goblinogm/gremlin-server-python:latest
       alias: gremlin-server
   image: goblinogm/goblin-buildchain
   script:
+  - pip install -U codecov codacy-coverage
   - pip install -U -r requirements.txt
-  - python setup.py test
-
+  - coverage run --source=goblin/ setup.py test
+  - python -m unittest discover
+  - coverage report -m
+  - coverage xml
+  - python-codacy-coverage -r coverage.xml
+  - codecov
+  coverage: '/TOTAL.+ ([0-9]{1,3}%)/'
 pages:
   script:
   - pip install -U -r requirements.txt
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index ae58086cb6afdef217085e436b8bd00b1355d2b8..0000000000000000000000000000000000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-sudo: required
-dist: trusty
-
-language: python
-python:
-  - 3.5
-  - 3.6
-
-services:
-  - docker
-
-before_install:
-  - docker pull leifurhauks/gremlin-server-tinkergraph
-
-install:
-  - pip install -e .[all]
-  - docker run -d --name gst -p 8182:8182 leifurhauks/gremlin-server-tinkergraph
-
-before_script:
-  - sleep 30
-
-script:
-  - python setup.py test
-
-after_success:
-  - coveralls
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000000000000000000000000000000000000..45d340799897e3ff1ce545b7198220e33321c534
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,6 @@
+# Goblin Changelog
+
+## v2.1.1
+
+* Fixed incorrect hashable id handling on Janusgraph.
+* Updated to run on newer versions of gremlin-python, 3.4.3 is the latest compatible version.
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000000000000000000000000000000000000..1031d6749743c5b12fbfd188e050f0613220f612
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,72 @@
+# Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* Unwelcomed sexual attention or advances.
+* Derogatory comments about a persons appearance, race, or sexual orientation.
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at
+[aparapi@syncleus.com](mailto:aparapi@syncleus.com). All complaints will be
+reviewed and investigated and will result in a response that is deemed necessary
+and appropriate to the circumstances. The project team is obligated to maintain
+confidentiality with regard to the reporter of an incident. Further details of
+specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000000000000000000000000000000000000..72ae15c47f85b7bfc935530982707d699d568dc9
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,97 @@
+# Contributing
+
+[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
+[![Semantic Versioning](https://img.shields.io/SemVer/2.0.0.png)](http://semver.org/spec/v2.0.0.html)
+[![Gitter](https://badges.gitter.im/Syncleus/aparapi.svg)](https://gitter.im/Syncleus/aparapi?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
+When contributing to this repository, it is usually a good idea to first discuss the change you
+wish to make via issue, email, or any other method with the owners of this repository before
+making a change. This could potentially save a lot of wasted hours.
+
+Please note we have a code of conduct, please follow it in all your interactions with the project.
+
+## Development
+
+### Commit Message Format
+
+Starting version 1.3.3 and later all commits on the Syncleus Aparapi repository follow the
+[Conventional Changelog standard](https://github.com/conventional-changelog/conventional-changelog-eslint/blob/master/convention.md).
+It is a very simple format so you can still write commit messages by hand. However it is
+highly recommended developers install [Commitizen](https://commitizen.github.io/cz-cli/),
+it extends the git command and will make writing commit messages a breeze. All the Aparapi
+repositories are configured with local Commitizen configuration scripts.
+
+Getting Commitizen installed is usually trivial, just install it via npm. You will also
+need to install the cz-customizable adapter which the Aparapi repository is configured
+to use.
+
+```bash
+
+npm install -g commitizen@2.8.6 cz-customizable@4.0.0
+```
+
+Below is an example of Commitizen in action. It replaces your usual `git commit` command
+with `git cz` instead. The new command takes all the same arguments however it leads you
+through an interactive process to generate the commit message.
+
+![Commitizen friendly](http://aparapi.com/images/commitizen.gif)
+
+Commit messages are used to automatically generate our changelogs, and to ensure
+commits are searchable in a useful way. So please use the Commitizen tool and adhere to
+the commit message standard or else we cannot accept Pull Requests without editing
+them first.
+
+Below is an example of a properly formated commit message.
+
+```
+chore(Commitizen): Made repository Commitizen friendly.
+
+Added standard Commitizen configuration files to the repo along with all the custom rules.
+
+ISSUES CLOSED: #31
+```
+
+### Pull Request Process
+
+1. Ensure that install or build dependencies do not appear in any commits in your code branch. 
+2. Ensure all commit messages follow the [Conventional Changelog](https://github.com/conventional-changelog/conventional-changelog-eslint/blob/master/convention.md)
+   standard explained earlier.
+3. Update the CONTRIBUTORS.md file to add your name to it if it isn't already there (one entry
+   per person).
+4. Adjust the project version to the new version that this Pull Request would represent. The
+   versioning scheme we use is [Semantic Versioning](http://semver.org/).
+5. Your pull request will either be approved or feedback will be given on what needs to be
+   fixed to get approval. We usually review and comment on Pull Requests within 48 hours.
+
+### Making a Release
+
+Only administrators with privilages to push to the Aparapi Maven Central account can deploy releases. If this isn't you
+then you can just skip this section.
+
+First ensure the package is prepared for the release process:
+
+* Make sure any references to the version number in the readme is updated
+  * Version number in dependency maven snippet.
+  * Add new version to javadoc version list.
+* Ensure that none of the dependencies used are snapshots.
+* Update the changelog file.
+* Check that all Aparapi libraries used as dependencies point to the latest version.
+
+Next lets take a few steps to do the actual release:
+
+1.  Update everything listed above. Do **not** drop the package version's `-SNAPSHOT` suffix in master.
+2.  Create a release branch, but make sure never to push this branch to the server: `git checkout -b release`.
+3.  Update the README.md again to ensure travis badge and javadoc badge point to static tag and not latest.
+4.  Drop the `-SNAPSHOT` suffix from the package version.
+5.  Commit the current changes using a generic commit message such as `build(release): version 1.2.3`.
+6.  Fully test the software before deploying, run all tests and install locally to test against the examples package.
+    You can install the package locally with `mvn clean install`.
+7.  Once satisfied the package is stable deploy it to maven central by executing `mvn -P sign clean package deploy`.
+8.  If deployment was successful then create a new tag for the current version with the following command:
+    `git tag -a v1.2.3 -m "Version 1.2.3"`.
+9.  Push the newly created tags to the server: `git push origin v1.2.3:v1.2.3`.
+10. Go to Github and go to the release. Update the description with the changelog for the version and upload
+    all the artifacts in the target folder.
+10. Checkout master again and then delete the release branch: `git branch -D release`.
+11. Bump the snapshot version of the package to the next expected version, commiting the changes and pushing.
+12. Deploy the new snapshot to the snapshot repository (no need to sign): `mvn clean deploy`.
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
new file mode 100644
index 0000000000000000000000000000000000000000..87cbcc5c27346e46897617002c7b585eff95ca96
--- /dev/null
+++ b/CONTRIBUTORS.md
@@ -0,0 +1,4 @@
+# Contributors
+
+* Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com> - Project owner from 2019 to present.
+* David M. Brown <davebshow@gmail.com> - Project founder and project owner from 2016 - 2019.
diff --git a/LICENSE b/LICENSE
index 03b94f848cc4a6b276f4c4b00bdd39d8c6ddf0b2..d645695673349e3947e8e5ae42332d0ac3164cd7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,13 +1,202 @@
-Copyright 2017 David M. Brown
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-    http://www.apache.org/licenses/LICENSE-2.0
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
\ No newline at end of file
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/NEWS.txt b/NEWS.txt
deleted file mode 100644
index 79d0dc83223b6cfd65ea0bcb99af2fb1f260ca36..0000000000000000000000000000000000000000
--- a/NEWS.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-News
-====
-
-1.0.0b2
--------
-- added a NEWS.txt (changelog)
-- lot's of fixes!
-- better HEADLINES for the next release
diff --git a/NOTICE b/NOTICE
index b1b111ad84dad13c3c616ffd9a50ed499db850b0..f1ced826b63f49f2151793be71433d6098f86595 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,13 @@
-Goblin
-Copyright 2017 - David M. Brown
-Copyright 2017 - Swiss Data Science Center (SDSC)
-A partnership between École Polytechnique Fédérale de Lausanne (EPFL) and
-Eidgenössische Technische Hochschule Zürich (ETHZ).
+Copyright (c) 2017 - 2020 CleverThis, Inc. and other contributors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/README.md b/README.md
index 861abb8e26ce47c32c9cba24d5c937154e2212ca..9f47bba562a83e2e661a5fb91e75a9576907d28c 100644
--- a/README.md
+++ b/README.md
@@ -1,27 +1,67 @@
-# Goblin OGM for the [TinkerPop 3](http://tinkerpop.apache.org/) [Gremlin Server](http://tinkerpop.apache.org/docs/current/reference/#gremlin-server)
-[![Build Status](https://travis-ci.org/davebshow/goblin.svg?branch=master)](https://travis-ci.org/davebshow/goblin) [![Coverage Status](https://coveralls.io/repos/github/davebshow/goblin/badge.svg?branch=master)](https://coveralls.io/github/davebshow/goblin?branch=master) [![Gitter chat](https://badges.gitter.im/davebshow/goblin.svg)](https://gitter.im/davebshow/goblin?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Documentation Status](https://readthedocs.org/projects/goblin/badge/?version=latest)](http://goblin.readthedocs.io/en/latest/?badge=latest)
+# ![Goblin logo](https://git.qoto.org/goblin-ogm/goblin/uploads/bb8f7349fdb9aa2a7a244e4c95b380a7/goblin-logo.png)  Goblin OGM
 
 
-[Official Documentation](http://goblin.readthedocs.io/en/latest/)
+[![tests](http://git.qoto.org/goblin-ogm/goblin/badges/master/pipeline.svg)](http://git.qoto.org/goblin-ogm/goblin/commits/master)
+[![Requirements](https://requires.io/github/goblin-ogm/goblin/requirements.svg?branch=master)](https://requires.io/github/goblin-ogm/goblin/requirements/?branch=master)
+[![test coverage](http://git.qoto.org/goblin-ogm/goblin/badges/master/coverage.svg)](http://git.qoto.org/goblin-ogm/goblin/commits/master)
+[![codecov](https://codecov.io/gh/goblin-ogm/goblin/branch/master/graph/badge.svg)](https://codecov.io/gh/goblin-ogm/goblin)
+[![Codacy](https://api.codacy.com/project/badge/Grade/7d7e40a92482485c851e303cfbf5eb39)](https://www.codacy.com/gh/goblin-ogm/goblin)
+[![Scrutinizer](https://img.shields.io/scrutinizer/quality/g/goblin-ogm/goblin/master.svg?style=flat)](https://scrutinizer-ci.com/g/goblin-ogm/goblin)
 
+[![PyPi](https://img.shields.io/pypi/v/goblin.svg?style=flat)](https://pypi.python.org/pypi/goblin)
+[![Supported Versions](https://img.shields.io/pypi/pyversions/goblin.svg?style=flat)](https://pypi.python.org/pypi/goblin)
+[![Downloads](https://img.shields.io/pypi/dm/goblin.svg?style=flat)](https://pypi.python.org/pypi/goblin)
+[![SemVer](https://img.shields.io/badge/SemVer-v2.0.0-green)](https://semver.org/spec/v2.0.0.html)
+[![docs](https://readthedocs.org/projects/goblin/badge/?version=latest)](https://goblin.readthedocs.io/en/latest/)
+[![Gitter](https://badges.gitter.im/goblin-ogm/goblin.svg)](https://gitter.im/goblin-ogm/goblin)
+
+# Goblin OGM on top of [TinkerPop 3](http://tinkerpop.apache.org/)
+
+
+**Licensed under the Apache Software License v2**
 
-Developers note:
 The original Goblin was a TinkerPop 3 ready port of Cody Lee's mogwai, an excellent library that had been developed for use with pre-TinkerPop 3 versions of Titan. We designed Goblin to provide asynchronous programming abstractions that would work using any version of Python 2.7 + with a variety of asynchronous I/O libraries (Tornado, Asyncio, Trollius). While in theory this was great, we found that in our effort to promote compatibility we lost out on many of the features the newer Python versions provide to help developers deal with asynchronous programming. Our code base became large and made heavy use of callbacks, and nearly all methods and functions returned some sort of `Future`. This created both a clunky user API, and a code base that was difficult to reason about and maintain.
 
 So, we decided to rewrite Goblin from scratch...
 
 ## Features
 
-- High level asynchronous *Object Graph Mapper* (OGM)
+* High level asynchronous *Object Graph Mapper* (OGM)
 
-- Integration with the *official gremlin-python Gremlin Language Variant* (GLV) - now provided by [aiogremlin](http://aiogremlin.readthedocs.io/en/latest/)
+* Integration with the *official gremlin-python Gremlin Language Variant* (GLV) - now provided by [aiogremlin](http://aiogremlin.readthedocs.io/en/latest/)
 
-- Native Python support for asynchronous programing including *coroutines*,
+* Native Python support for asynchronous programing including *coroutines*,
   *iterators*, and *context managers* as specified in [PEP 492](https://www.python.org/dev/peps/pep-0492/)
 
-- *Asynchronous Python driver* for the Gremlin Server - now provided by [aiogremlin](http://aiogremlin.readthedocs.io/en/latest/)
+* *Asynchronous Python driver* for the Gremlin Server - now provided by [aiogremlin](http://aiogremlin.readthedocs.io/en/latest/)
+
+* Async `Graph` implementation that produces *native Python GLV traversals* - now provided by [aiogremlin](http://aiogremlin.readthedocs.io/en/latest/)
+
+## Donating
+
+[![Librepay](http://img.shields.io/liberapay/receives/goblin-ogm.svg?logo=liberapay)](https://liberapay.com/goblin-ogm/donate)
+
+As an open-source project we run entierly off donations. Buy one of our hardworking developers a beer by donating with one of the above buttons. All donations go to our bounty fund and allow us to place bounties on important bugs and enhancements.
+
+## Support and Documentation
 
-- Async `Graph` implementation that produces *native Python GLV traversals* - now provided by [aiogremlin](http://aiogremlin.readthedocs.io/en/latest/)
+This project is officially hosted on [QOTO GitLab here](https://git.qoto.org/goblin-ogm/goblin) however an up-to-date mirror is also maintained on [Github here](https://github.com/goblin-ogm/goblin).
+
+Documentation: [latest](http://goblin-ogm.qoto.io/goblin)
+
+For support please use [Gitter](https://gitter.im/goblin-ogm/goblin) or the [official Goblin mailing list and Discourse forum](https://discourse.qoto.org/c/PROJ/GOB).
+
+Please file bugs and feature requests on [QOTO GitLab](https://git.qoto.org/goblin-ogm/goblin/issues) our old archived issues can still be viewed on [Github](https://github.com/davebshow/goblin/issues) as well.
+
+Aparapi conforms to the [Semantic Versioning 2.0.0](http://semver.org/spec/v2.0.0.html) standard. That means the version of a release isnt arbitrary but rather describes how the library interfaces have changed. Read more about it at the [Semantic Versioning page](http://semver.org/spec/v2.0.0.html).
+
+## Related Projects
+
+This particular repository only represents the one component in a suite of libraries. There are several other related repositories worth taking a look at.
+
+* [AIO Gremlin](https://git.qoto.org/goblin-ogm/aiogremlin) - An asynchronous Gremlin DSL for gremlin-python.
+* [Goblin Buildchain](https://git.qoto.org/goblin-ogm/goblin-buildchain) - Docker image containing all the needed tools to build and test Goblin.
+* [Python Gremlin Server](https://git.qoto.org/goblin-ogm/gremlin-server-python) - Vanilla Gremlin-server with Python Script Engine loaded, used for integration testing.
 
 ## Developers
 
@@ -34,4 +74,3 @@ gitlab-runner exec docker test
 ```
 
 Keep in mind this will run the tests on your local copy of the master branch so any changes not committed locally will be missed when testing.
-
diff --git a/goblin/fileio/graphson.py b/goblin/fileio/graphson.py
index 7ba86dac068f6371dade7e59546694d7a6c98561..6727fbc34d565310f562845bc3285f850f29e6d3 100644
--- a/goblin/fileio/graphson.py
+++ b/goblin/fileio/graphson.py
@@ -4,12 +4,12 @@ try:
 except ImportError:
     import json  # type: ignore
 
-from gremlin_python.structure.io import graphson # type: ignore
+from gremlin_python.structure.io.graphsonV3d0 import GraphSONWriter
 from goblin.element import Vertex, Edge, VertexProperty
 from goblin.manager import ListVertexPropertyManager
 
 
-writer = graphson.GraphSONWriter()
+writer = GraphSONWriter()
 
 
 AdjList = collections.namedtuple("AdjList", "vertex inE outE")
diff --git a/goblin/session.py b/goblin/session.py
index 93f4c719a72b81ee113d603ab99291d0cc21ab8a..8df2083cf354f32bd6ebca429fabdf4a7b8034c3 100644
--- a/goblin/session.py
+++ b/goblin/session.py
@@ -516,8 +516,9 @@ class Session:
             if not metaprops:
                 metaprops = {}
             if val is not None:
-                key = ('k' + str(binding), db_name)
-                val = ('v' + str(binding), val)
+                key = db_name
+                #key = ('k' + str(binding), db_name)
+                #val = ('v' + str(binding), val)
                 if card:
                     # Maybe use a dict here as a translator
                     if card == Cardinality.list_:
diff --git a/requirements.txt b/requirements.txt
index dbe3726f9fb87167dd65e09a12d84b4234afa228..5f99963091aa7b196c43960d6b8e05b4c15cbd3c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,14 +1,16 @@
-#required foir goblin
-six==1.10.0
-aenum==1.4.5
-aiohttp==2.3.10
-aiogremlin==3.2.6
+gremlinpython>=3.4.3
+aiogremlin==3.3.2
+PyYAML==5.3
+six==1.14.0
+aenum==2.2.3
+aiohttp==3.6.2
 inflection==0.3.1
-gremlinpython==3.2.6
 
-#for goblin testing
-pytest-asyncio>=0.8.0
+#for testing
+pytest-asyncio>=0.10.0
 pytest-cache>=1.0
-pytest-cov>=2.5.1
+pytest-cov>=2.8.1
 pytest-pep8>=1.0.6
-pytest>=3.2.1
+pytest>=5.3.4
+pytest-timeout>=1.3.4
+coverage==5.0.3
diff --git a/setup.cfg b/setup.cfg
index 72e69bcd7e7b8cc0c2806ea1f270179e186b35b9..2579a0aff14d1696468b8c5e2e5a3c987fed26ae 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,4 +1,5 @@
 [aliases]
 test=pytest
 
-
+[tool:pytest]
+timeout = 5
diff --git a/setup.py b/setup.py
index c8fe04eedac91117df2507a4e1224fe8463639be..48bb598704350c4eb4f0fae66ccb3bf46d2dacce 100644
--- a/setup.py
+++ b/setup.py
@@ -13,6 +13,7 @@ tests_require = [
     'pytest-cache>=1.0',
     'pytest-cov>=2.5.1',
     'pytest-pep8>=1.0.6',
+    'pytest-timeout>=1.3.4',
     'pytest>=3.2.1',
     'uvloop>=0.8.1',
 ]
@@ -34,8 +35,7 @@ setup_requires = [
 ]
 
 install_requires = [
-    'aiogremlin>=3.2.6',
-    'gremlinpython>=3.2.6',
+    'aiogremlin>=3.3.2',
     'inflection>=0.3.1',
 ]
 
diff --git a/tests/test_graph.py b/tests/test_graph.py
index bda3bf5e6ec756a3d45786078a0e2e3a1894a2d2..9f79457b7cc9f007e228042216f303aef55da32d 100644
--- a/tests/test_graph.py
+++ b/tests/test_graph.py
@@ -1,6 +1,6 @@
 import pytest
 from aiogremlin import process
-from gremlin_python.process.traversal import Binding
+from gremlin_python.process.traversal import Binding, T
 
 from goblin import driver
 
@@ -12,7 +12,7 @@ async def test_generate_traversal(remote_graph, remote_connection):
         traversal = g.V().hasLabel(('v1', 'person'))
         assert isinstance(traversal,
                           process.graph_traversal.AsyncGraphTraversal)
-        assert traversal.bytecode.bindings['v1'] == 'person'
+        assert traversal.bytecode.step_instructions[1][1][1] == 'person'
 
 
 @pytest.mark.asyncio
@@ -21,8 +21,8 @@ async def test_submit_traversal(remote_graph, remote_connection):
     resp = g.addV('person').property('name', 'leifur').valueMap(True)
     leif = await resp.next()
     assert leif['name'][0] == 'leifur'
-    assert leif['label'] == 'person'
-    resp = g.V(Binding('vid', leif['id'])).drop()
+    assert leif[T.label] == 'person'
+    resp = g.V(Binding('vid', leif[T.id])).drop()
     none = await resp.next()
     assert none is None