Continuing major windowing updates.  Still not working but getting there.