@ruimalheiro Not sure where to take things from here.  Any more iteration from my side I feel is best spent to solve the remaining issues.  I think you got the general idea, but nailing all the details will be time consuming.  

What do you think?