Removes coordinates and addes content and hit methods.
Adds water class and tests.