making progress on the windows structure