Filled in sam's thing, worked on CP logic