Compiles again. Seems to be working.