Mad progress on the refactor. Still need to troubleshoot a few untested areas of the app, but the basic render functions are back up, and life is looking brighter.