Making Progress on new HTML output