Maybe this should return the user