More windowAdd stuff.