One of these days @mikesherov - you, me and a night with sinon?