Rik call info 1047353

Storing a ```current***``` variable seems a bit prone to error to me. Can we store this on the event target instead?