More work converting to Markdown