Redesigned Main File For OOP