I've got a WiR in the works (expect an int check tomorrow).