pushing functionality around
restructuring and adding dbus functionality