Watersmart 359

Refactoring Code Review, Please don't merge until review is over.