refactor code; Client.new for auth now;