Reworked Main, Ship

Simplifies code, making things easier from now on.