Working towards having it work in reality
Fixed a failing test
Modify various mappings to work, as far as I can tell
Merge pull request #1 from isotope11/feature/actual_testing

Feature/actual testing