Starting work on fixed events editor