Made more progress on inspector.