More work on water

Still doesn't work right