Water: Make the model more modular
Water: Controls won't freak out if they're missing
Water: Add a static-layer version of the water model