Working on event view
Mergin conflicts of this