mapValues was the wrong method to use as I wanted it to happen eagerly