Updated todo, added more entities to spawn