merged aesthetics

mesh and water now working together