Reworked the class object to take arguments