Merge pull request #1 from bparrish206/dev

Dev
Merge pull request #2 from bparrish206/dev

Dev
Merge pull request #3 from bparrish206/dev

tweaks
Merge pull request #4 from bparrish206/master

merging