EQH-2136

Previous pier commits may have been lost. I made a copy of my changes and reset everything to my master because of some things that I broke.