Modified code to use new singleton Photo module. Some debug comments cleanup.