Rename the narrowScope method to rebase, also make more tests pass and restructure the tests to separate out the differen types
Start work on the fields use cases.