Updated Assignment 2.2

Made a few changes.
Let's lose all the code below this line and just submit the function.