Commit for work up to 12/15 before hack week stuff.