More core work. Added proxy support.