90% of the way there to getting lookup on saved pictures working.