Moved to using a File Query Store.  Rewinding a lot here and brining things into this src tree and then breaking out when is looks a lot better