finished Ship movement, refactored parameters