cruft? future TODO for proxy support?