Refactored handler, prepare for spell check...