fighting git but getting there