event create part mostly done
merge 1