WIP style and design. Pushing so others can have access to current state
Merge pull request #32 from jjow/style_design

WIP style and design. Pushing so others can have access to current state