Merging the EventQ and MakingPatients code