Finished re-write CoM; started CoP