More work on Water class