The working code for my site's redesign - in progress