added headers
removed old listener that is no longer used
added tests