CPK Refactoring - code compiles, next move, testing and correcting