Buncha changes
Merge pull request #54 from nolanfilter/JimmyJam

Buncha changes