wip/cpm
