Homework

I added some stuff.  Merge!