adding tokenization, switching to array, tests passing