Trying to organize main2