Checkpoint: compiling after the merge
Checkpoint: new solutiongraph scenario
A little more cleanup. Ready to start testing