CT's WIP codebase as on Oct 04, 2013