Completely revamped structure to include everything in the main class.