Working on refactoring the populator, started with entity writer. Putting entities in the correct order before inserting. This should prevent us from having to use a merge listener