@rande when you have a spare moment, can you give me some feedback on this, so I can finish this PR, please :) thanks