added all the awesome discovery goodness
Merge pull request #2 from ZachWilson130/discovery

added all the awesome discovery goodness
fixed merge conflicts