Next 3 files are from the install_via_git branch