Working version of CPT, migrating some other missing tools