@kcooney 
I spent quite a lot of time in #523 with this difficult areay. I will write a concept for us.

I am convinced that first better utilizing your little spare time in #578, and I will wait here for your inputs until we get consensus on #578.

Is it a good approach for you, Kevin?