First steps toward integrating new modal code.