pulled out common functionality into a library module under repo/.  Specifity the resource id now also works