Mainline Merge

This includes my six pull requests into a single PR that we're going to deploy locally. I will close the prior PRs. I think this can close out #83, #103, #105, #102 , #112, #113, #117, #52.