Cleanups and continuing to plumb in user resource in API