flow add should take a match for efficiency
Clean up the upcall receive pipeline
Working