First pass on refactoring/removing/integrating space ninja code into hardsuits. Incomplete.
Follow-on from previous commit, rebase had a merge in the middle so I couldn't squash 'em.
Fixing the merge.