John

Thanks for the review, I think this PR is nearly there if the design looks ok on your end. What's missing is testing it beyond the unit testing which I'm...

@Roasbeef I've added an `itest` and it seems to work as expected

@carlaKC yes was waiting for comments, and I will rebase

I've done the first part #514

currently working on this

I'm having a look at bringing https://github.com/lightningnetwork/lnd/pull/1755 up to date. I'm working on integration tests, in theory it should be working though. I can create a draft PR if it's...