More work on space ninja refactoring.