Added proxy support and moved streams around :P