2nd initial commit

Remaining commits from initial commit.