yeah... let's review.  wasn't enamoured of this, but it makes things much easier to read.