Adding basic window handling