More comment infrastructure
Comment is displayed
Merge branch 'master' of github.com:mgold/Normans-Ark