Add TODO
Open popup window as soon as possible