reorg
fixed bug
added (rudimentary) tests
test data
test data