Slowly getting there - nested map still not right