CT's WIP codebase as on Sep 23, 2013