Proxying

Issues fixed.