OK ready to merge in now. New window is done.