Ok. This still doesn't track Library or Temp, but it should track the rest appropriately.