Done, first pass

Satisfied with the site, Next refactor code according to degree
recommendation.