Cell class added
Water class added
Tidying up