Start revamping addition of events using name as input + some code cleaning. Work in progress, not usable.