major redo on site code