Adding second half of class.