The listeners are now stored in their own list which allows them to be a component separate from the service. The next step is to remove the listener iterator functionality and replace it with its STL counterpart.