Finally!

Closes https://github.com/Open-Code-Developers/BoatCraft/issues/161 .
Closes https://github.com/Open-Code-Developers/BoatCraft/issues/162 .
Closes https://github.com/Open-Code-Developers/BoatCraft/issues/163 .