Starting to modify the repo types.  Marc will finish.