Added all the welcomes, as well as the events
Trying to fix merge