Moved Ship to the correct location and made minor changes. This is a pre-merge commit