Completed

Additional work on event app