Updating the code for first half of the class.
Adding second half of class.