Getting things to compile & run again, with Tung's help.