Added some basic structure. Proxy classes, etc.