Added upgrades.  Still working on proper functionality.
Merge origin/master