Popup is now a class