Rising waters

Merge changes of the 3rd playtest