WATERSMART-315

* Major refactors to do conversion on the fly
* likely want to generalize this further