Revert "Major Updates i have been working on for class."

This reverts commit 9998f439ce913c054e06a472535f81b77e9a6648.
Revert "Revert "Major Updates i have been working on for class.""

This reverts commit 35ac146bd3a33be31820084a213c23b7c2238a15.