Much nicer HTML output, we're getting somewhere