Still not exactly sure how to clean this one up. @stefanpenner do you have some time to pair tonight or tomorrow?