Now works (more or less).