* Populate token from config
* Added caching
* General clean up