Successfully restructured the code some more.