Overhaul HTML #2, WIP