Quick logic update
update
Revert "update"

This reverts commit 3230722056a845ca9580ad5241d459f9f6fb5376.
update
Fixed GitHub Weirdness
Dunno about this one
Merge remote-tracking branch 'origin/master' into Shawn's_DevBranch