redoing from scratch!! the site is work in progress