Still broken (need to work out how to iterate over maps also)