Added drowning and associated menus
Merged my branch's changes