First working commit, no oldlog support yet