Major changes to windowing in progress.  Not yet finished.