Reworked events and added key. #38 #39