Event handling added, more experimentation