More user integration- still mocked