Rik call info 1047353

Storing a ```current***``` variable seems a bit prone to error to me. Perhaps we could store any info needed on each event target instead? It looks to me like this would only be a contact id and phone number, which doesn't seem that ugly to set in many places.