Demand Shifting with Thermal Mass in Light and Heavy Mass Commercial Buildings