hw4

I think I squashed the commits correctly.