Commit, morning of 1/29
Full, working commit.