Refactored to have populateEntities calls after hierarchy is called
Working on creating skeleton model