Updated lookup to support fingers, but still not done