Results 2 comments of Jeremy

Logic is good. @rrtheonlyone @madanalogy would you like to review? Or perhaps we should start refactoring.

Sure, feel free to continue converting the remaining diagrams.