Revert "Revert "Initial Window""

This reverts commit 7335e1a1ee890eb9aadb2674d9a49047ca40622b.