Assignment 7.1 and 6.1 New Updates

Sorry this was work in progress. I learned that I should create my pull request once I have a final version.