Add/Remove entities: DONE.