Revert "Revert "Match Window""

This reverts commit 1d14f2798b4ee1a330ababb40ff24430eb25a15f.