Finished implementing OOP functionality