Lots of progress converting to the Views query engine.