Added some magical proxying code, it's still very much WIP.