Work towards including n-grams