Design v1
Merging remore master
Merge pull request #4 from andmcgregor/design

Design