CT's WIP codebase as on Oct 08, 2013