CT's WIP codebase as on Sep 27, 2013