Some initial work on supporting proxy servers

Some initial work on supporting proxy servers for #48