Added mapping sensor -> measure

This is the way it was supposed to have been done from the start.
Or more correctly, the idea I had in mind from the start.