Adding window stuff