Part #2 of first commit.