Add new comments and write class for variables
Almost done