Moving token timer to token controller