My second attempt at a repository