::I think this actually looks pretty good. I'm not finished, I want to double check some of the guest stuff, and do some ref fix ups etc. but I think this is a good compromise between the two formats. -