commit before weekend. currently tracking down problem with ImageRegistry being reset