More work on port listener