Added modal support in preparation for upgrade integration.  After this, only checkmate highlighting willr emain.