Changes to enable subscription over the network. Changes look fine now,
rigorous testing needed.