Major re-factor of stpm2 class; added pstpm2 class; deprecated stpm2Old; started to add RUnit tests