Adding window functionality back