Ship Logic
Merge pull request #9 from Crysco/Crys'-Branch

Ship Logic
clean