Moved functions to GridServices, added tests. Renamed ship coordinates to r and c