New events for hints
Use new channels for collision events
Remove old mediator, add kitten channel
tidyup