It now compiles.  Have not yet tested in run.