added two files to structure out mark-up better, clean-up, working commit..getting very close