Updated todo, improved spawnEntity