Started refactoring the ship class away... bad side effect for mover.