Merged Boat Container code into the main custom boat class.
I hope I don't regret this...