this should handle the new proxy configuration stuff