Updated TPS and Completed Task 5 - 7