Working through commit shifting