#3 Continued XMPP migration - it kinda sorta works