Initial work-in-progress commit.