Add basic awater functionality, not any different than current other than it builds on x86-64.  Hope to get eqg functionality for it by the end though.