Merging cbohrer/finishingAddEventPage