All old functionality ported to popup system.