Added multi-window stuff.