Moving dashboard logic into a service
Merging conflicts