Added fancy auth token stuff