[WIP] Add proxy support

should be fixed now