Add design changes
Merge pull request #4 from andymarrell/master

Add design changes