Still making too many windows on reload argh