refactor
updates
refactor updates
delete stuff
more refactoring:
merging
bump version
basic tests
tests
merge