Repo cleanup
trying to fix edge case bug
Added some tests
Fixed parallel conflict bug but broke tests in minor way (having to do with dumping with no pool)
more tests I guess