Continued work for the initial commit.