cb2 migration checkpoint
initial engine conversion
Merge pull request #92 from dpaterson/pull-req-master-bb0ef750d7a0ff54b10b8076f343262a1a9c9d06

I'm taking this as a first step.  Please address the cleanup items that I've flagged