Use trigrams instead of bigrams
Separate bigram and trigram versions
Add TODO file