Beyond UI cleanups and tracking down (or rather trying to track down) some bugs exposed during monkey-testing, I've been seriously pondering how to handle what amounts to a huge change in approach to the app without disturbing it too much just before the demo next week. Thing is, I would really like this approach to hierarchies to be there in the demo, as it makes the whole thing a lot more compelling and simple to understand.