Dirty MQTT Hacks.  Fixup and merge tomorrow