Thanks for your original work! It was perfect to learn from, so thanks again!

I'll look at implementing your changes shortly, perhaps after a rewrite to circumvent the blocking behaviour experienced with the callbacks.