Fixed broken proxy. Basic functionality working