I will fix this terrible git log... I promise.