Gonna start using popup again, seems the best way