added ER queue and tests