CT's WIP codebase as on Sep 26, 2013