Refactored to use a presenter model and controller (Query) instead of the Word model and controller.