Work on hooking up API and cleaning up popups