WIP. Refactor
Using the same token controller for services
Removing observing values