Preliminary changes to EventMaker

also test of commit