I think that all new code should come in with getByToken