made some updates to entity grouping, not all the way there yet