architecture done.. not yet corrected

asdlf