Instantiated some of the classes. Put up a framework for adding upgrades.
Merge remote-tracking branch 'origin/master'