WIP moving to new CPK libs