Event handling functionality complete