Initial Proxy spike

This will probably miss something important, like tests and could also
be a lot less hackish.