Implemented tokenizer
merged with origin