Removed the shape stuff from water tower model and used mvt to convert model values to view values.