Modified to use the PubSub client
Merge remote-tracking branch 'origin/paddy_preferences' into paddy_preferences