Attempt at fixing git - needs to be rebased against master