Most events completed. Some refractored code.