Pausing progress on this for now while I add tests to the refactored UI codebase which has taken priority.