#15 logic overhaul / bypassing proxy router