Post 2nd merge.  Added UserEAO & updated IUserEAO.