CPK Refactoring, currently on tests