Updated TODOs
Extracted PhotoWheresiesSupport