Add Smasher816's stuff