Checkpoint. About to try compiling.
Checkpoint while compiling. Need Simon's input on design.