#12 partially done, also removed events in World