Preparing code for improvement. Better handling auth token.