Still working on new agent authentication system