Changes made to photo system, awaiting some advice from stack overflow