Got other ships in. Need to do a big clean-up/refactor next