Initial working proxy
Add production URL
Resolve conflicts