First commit.
Merge pull request #27 from brittainhard/design-fixes

Design fixes.