Yep, when we get around to adding those two new headers, this class will do the bulk of the heavy lifting.  I intentionally tried to tidy things up so that it will be much, much easier to do the new UI work later.