Overhauled building.  Improved plugin manager