Made some progress...