Fixin up commit caos