Finished events + new display + refractored code