Begin writing eventful function
fix merge conflicts