Ben code review
Refactored most of the code review TODOs
pulling from the back end
Fixed merge conflicts
Removed orig files
Merge pull request #5 from Mikedgs/Fix_tests

Fix tests