Oy. Hide the API key.
Add tracking for error handling
Conflicts resolved