silly mistake in map
demo commit ~ish
done with merges?