Working towards working git functionality