Are you going to implement my methodology or do you want me to? There will be delay of a couple of weeks before I can dedicate any reasonable amount of time to this although using this PR as a starting point makes things a lot easier than they were before.