Close
Once things are tested here for a while I'll send them upstream and see if rq wants to merge any of it.