Prerisky stuff commit.
Prework commit, Oct 3