Just refactored as you suggested earlier. I've still got a couple failures I'm working through though.