TimeoutErrors are now discarded as this is handled upstream
No point completely unsetting the timer
Working towards completing the channel model
Minor reworkings