Added SAPT helper
Serious updates to the SAPT code