Restructured TS map computation

As close to final as it could get today.
Add empty line after this one.