CT's WIP codebase as on Oct 1, 2013