Reworked Main, Ship

Simplifies code, making things easier from now on.
Merge pull request #1 from TheBen27/Ben_Branch

Reworked Main, Ship