Remove dependencies on user id's so that external libraries don't need to know about a user's id. Implemented more of the user store.