Better object tracking

Don't rely on there to be 1 object instance in an object group