Start implementing the connection tracking