Added Markdown support, updated form, updated methodology