CP now also starts + code restructuring