Cleanup - Added an entities() class that keeps track of types of objects.