All test pass now
Only getting about 87% code coverage
need to write more tests