fixed dumb bugs
fixed unit tests
tests work for an initial version
Code works for basic unit_tests; need to add more