Make some changes to global variable interaction to get ready for menu + map