Trying to put back my changes

- Adding back in JSR stuff
Merge pull request #17 from cgoodling/origin/abby

Trying to put back my changes