New branch at least compiles.