Small steps towards new setup, reintroducing TokenStore, ThreadPool, etc.