More progress
Inspector 1st pass done