More infrastructure to talk to etcd -- needs some refactoring when it all works