Hope this doesn't break everything
Merged and 'fixed' conflicts
Merge pull request #1 from madmott/jr_testing

Jr testing