added goals, new tests
update goals
all but one test passes; bin still unchanged
cli works again
cleanup
tests pass
some interface cleanup
Merge pull request #17 from garbados/refactor

Refactor