Fixed tokenizer, still need to implement actual token pushing to token array