Working on it - doing some cleanup. T2.