Started from fresh source, added in known-relevant Ti bits (lots of old code does nothing or has no known place now). Seems to work\?