CT's WIP codebase as on Oct  17, 2013