Starting on a clean up / refactoring of proxy API to use interfaces and mirrors.