Reviewing TODO - interim commit
Merge branch 'develop' of github.com:gklyne/annalist into develop