CT's WIP codebase as on Sep 25, 2013