C Diff based stuff working it seems