design done

design done (besides popup)
have yet to implement event listners.
Merge remote-tracking branch 'origin/Stevenbranch'