Initial work on tokenizer