First draft
Switch to new dbus lib