Yeah, I'm kinda using this as a "what I need" branch, and rebasing every now and again. When I get time I'll pull this out