refactoring + moving ship