More touches to bigrams. Working on making it more lean/scalable