Started work on putting schema to use in main windows