Added code for water intersection (unused)
Implemented new style of using ret
Refactored the use of ret
Last commit before going home