First commit of working water

Making it better looking is on to-do.