New HTML - includes the actual WP rendered HTML to make it match exactly.  Added more WP php as well.