tests don't pass, refactoring some things, playing around with the idea of hydrants and dynamic values/flows