CT's WIP codebase as on Oct 15, 2013