More work on bug #8149.  I added in a selector for the port.  Now I just need to put it into the encoding.