- Rework our oskittcp signalling