Hacking to add popup content and question overlay.
Merge changes with master