Finished the class exercise