Bringing this up to date with the realities of git