DAR-36: finish the rest of the photo tool tracking.