Merge In-Dev with Master

Still in very early development stages.  Basic increment of water intake and visual style.