Added the multiple focus for events feature
added the rest of the files from last merge