bindings refactor and simplification down to just the necessary bindings and tests.