add in ships!
merge all the things!!!
merge all the things!!! (again)