More work with the entityQuery dsl.  Started re-factoring to cfscript