Changes to add git hackery