Refactored code to use multi_git and recent ridley