WIP: rewrite for service to use specified repository