Reorder everything so that delayed init can occur