Added a query object to stand in for any future query implementations. Also added tests to ensure that the implementation was working accordingly.