Move timer to connection, as that's where it belongs