integrating manager
added tokens class
merged