Trying to put back my changes

- Adding back in JSR stuff