Finally completed SP and TM!!!

Added compute methods and 3 tests for same.