Updated spawn entity, still incomplete