Homework Week 2

I think I finally got this figured out. Hopefully now I can catch up on my pull requests.