Continuing work for the initial commit.