Restructured the whole damn thing