Eqh 2479

Contains all of the current code for EQH-2453, EQH-2387, EQH-2479.