Good progress. Need to fix cp_size calc though.