[SAVE BREAKING] Oona preliminary

Do the save-breaking stuff now, laying groundwork for oona to replace Apollyon