Finished Initial Commit of Part 2 along with minor fixes for TPCLog