Basic query implementation, testing and better reporting still needed