Rename things and add center of mass