going through tests
hm
tons of new tests for new functionality
more tests and fixes
more tests and fixes
fix