Second commit.

Hopefully what I want to do will work.