Initial work on the expander popups, no actual popup yet