getting close to making git work