Began implementing new popup, but still a work in progress