Move word checking and logic to separate class as part of #8.