This gives it parity with the other systems: cofd and cthulhu. More refactoring and a rewrite later as we trend towards more system-specific implementations.