Created OOP File + Improved Functionality