Started work on events / control panel