fixing up user_api to work more consistently with our new way of doing things