revert back to entityId
change spawn to pull from entityMaster