What a long day. For the record, I love well organized, properly refactored code.