more ship mover changes

still not done
need to fix failing unit test and create utility function