This commit has Carly's feed back and some work on tests
Finishing up the tests