Massive Update to Boiler Plate