CT's WIP codebase as on Oct 23, 2013