Fork CMS Events Module

Made some changes. See if you are willing to merge them.