Dashboard work
merging