Making the windows part TBD per @jadient's instruction.