Recommitting background and moving ship, plus .gitignore changes