Pushing this up so we can eliminate the date field from scheduled events
Fixed Merge Conflict