Big hairball of a commit