I think this should be implemented in this branch. @windwarrior what do you think?