Reef agreement, ship setup, heavy refactoring
Minor
Minor
resolved merge