Continued work on the initial commit.