Started work on eventbus and tokens and caching