refactored wire tap
Allow for headers in results