switch to markdown/template system