Almost there, continuing with major re-factor of tracker code.
Add completion channel