The query engine is mostly done.  Some of the model student queries have been converted.  This works much faster and is much more organized and obvious.