cleanup and new stuff
Merge pull request #2 from darrina/feature/stuff

cleanup and new stuff