First ship commit
Revert "First ship commit"

This reverts commit 853334d6ff5106a8d801ace1baad18bbfdbdf9fe.