I'm still not exactly sure how to clean this one up. @stefanpenner Maybe we can pair on it tonight or tomorrow?