Yes.  I want to move this (and several other things like having to call `StatisticsPage()` vs `ConsoleHandler()` vs `AdminPage()` vs `ResourceFetch::Start()`) into PSOL.