Still fighting with git.....