Tidy.
Combined findId and findService into lookup function parameter; now returns object. Added auth function parameter.