token generator added, tests need to be done