Hi! Thanks for the patch! Although there's several issues in the way the code has been refactored here, and as I was planning on reworking most of it anyway, it will be faster for me to just do that instead of a back and forth process of review and fixup, etc. Thanks, Guillem