First pass at new design.
Merge pull request #2 from kickstorming/design

First pass at new design.