MainWindows, AddInfo modules complete