Corrupted my original branch. Starting fresh with all work in new branch.
Merge pull request #1 from Ping0314/barbarchery2

Creating new pull request for barbarchery2