Added tokenizing, still kinda broken