Yep - makes perfect sense. Thanks for the guidance - much appreciated. I've made the changes to the code - I'll push a new commit. I'll wait a bit first incase there are any other changes to be made...