Catchy new name for CPEntity
Changed x/y functions a bit