#12 Added tracking of entity instances.
I forgot