Friday Office commit.

Hopefully bug free commit.