More TODOs taken care of, L and T more split up, Satisfy down to 2 lines