Winchan refactor.

Changing popup logic to use Winchan.