Code cleanup #2, With working custom events…