Merge pull request #37 from ArcBees/brandon_upgrades5

Brandon upgrades5
Merge pull request #36 from ArcBees/brandon_upgrades4

I fixed some code I overwrote on a paste earlier.
Merge remote-tracking branch 'origin/master' into brandon-upgrades5_basic
Myproject mod