connection: Add to a TODOish