Added Water Class, implementation for solving