Added the relevant stuff.

I have to admit, this was a lot easier than the first.