user profile now has info coming in
merge users branch in