Kinda new design, but not finished yet
Merge pull request #3 from JonnyBurger/design

Kinda new design, but not finished yet