Added calendar
Added filter for events for current user
Merging