Chris Smart

Just wanted to follow this up to see if we were thinking we should merge this as is, and then follow up with a separate MR? Thanks!

@stratus-ss are you interested in having a look at this MR too? I'm interested in what you think and also that it complements #191

Just following up whether we think we should merge this as is, as per above comments.. thanks!

Let's merge this as it is and hope we can fix any shortcomings in the future, given it's been dragging on a while. Thanks @NK308