Started work on event handler system