CT's WIP codebase as on Oct 24, 2013