Added all the work from class