Rodri interactive maps

More tests will be created but I'd like this code from me and Lukasz J. to be CR to reduce amount of conflicts when merging to master once done. 
return in one line