Adjusted Classes to Allow for easier Data Flow