Completed first version of Water class