WIP store_token + test porting