Triple core update

This is ready to go, and can be auto merged!
I incorporated the changes described in our TODO list from our Feb. 26-27 Meeting notes.
https://docs.google.com/a/stroudcenter.org/document/d/1P0y-NNNiKQ170dUkHmU2XUrHku2rVB9CNhFR3YVf6R8/edit#bookmark=id.u2ljnzqdnrob