Fixed token init branch

Finally works!