Started to create functionality to populate MainWindows
Merge oakes121/development into development