Testing some ideas for #4. Fixing some the ship_stuff