Minor refactor, WIP add_ship