Final Working Version
Merge remote-tracking branch 'origin/personal/trevor' into Jkenney94