#106 milestone prep 2

Fixes #106 
More milestone prep!  See individual commits for changes.