Adding TCP predicates
Starting to refactor to something manageable