#106 milestone prep 2

More milestone prep!  See individual commits for changes.  More to come!