got a semi-working bobgit subtree by now