More scratchy stuff.
Converted engine to closure style; tests fail.