Changed code so tokens save start/stop indices instead.