Made a lot (but not all) of the design changes.
Merge pull request #12 from anindyabd/master

Made a lot (but not all) of the design changes.