added another buddy
Restructure main
Restructure main
Restructure main2