WIP
WIP
track finished event handler