trial and error with git...