An initial working take at the Query command