Restructured the whole thing.