First draft

Needs to review the HTML output for completeness