Second commit.  May need a few extra questions.