I have done something of the sort on the latest commit