Checkpoint -- migrate classy into this branch