Totally reinvented the structure. site is not done