Fix up the build and add feature/repo