working on photos
horrible bullshit
MODALS
merge conflicts resolved