Changes to assignment 1 to include all the progress