WIP better token things