added a popupthingie
forgot to add some files
Merge branch 'popup' into dev