Spr mapper

Merge in the amended speed, (power), resistance mappers and tests