Savepoint prior to re-factoring pstpm2
Refactor pstpm2 to allow for different links
pstpm2 now with different link functions