addding user management features - 90% done