Getting confused about the mapper & commenting todos