major messing around with popups
..
..
..
..
..
redo
..
..
..
..
..
final pushes