working add + remove windows, better organization