Photos now work
Fixed merge conflicts