Started on client, fixed some bugs in tokenizer