Made a start on getting adapted bindings to use other services.