Make both versions of map work
Extract partials