CT's WIP codebase as on Oct 10, 2013