moved map, added map moved, removed test code from main