Add mechanism for rendering fluid container items with substance data.  Add support for Fluid:Water.  Add a mechanism to hide layers of an overlay.   Refactoring.