Would really love to see this window get an update