Excellent - seems like we can agree on a way forward. :smile: 

I'd still rather leave that for a separate PR though - it'll take a whole different level of complexity to this PR (which is basically just a cut 'n' paste job).