Work on making restoring work
Popups working, event resorting seems to be working