ogit: Rewrite and reconfigure