First try at pull request

Cameron, since I'm working in my forked version this pull request is how I'll have to get those changes to yours.