Pull in multi-token support -- has issues for scale