fully adding ability to have multiple users