Service builder now being used
Service factory now keyed on message context
Now working with two channels
Some tidying up