Initial revamp, some features may be missing
Merge pull request #1 from seanjohnson08/sean/revamp

Initial revamp, some features may be missing