Only update unlocked photo if it wasn't previously
Update TODO comments