Corrected errors where new WaterBox code was a method rather than a class.