Rework to use markdown to make it easier to render to mediawiki