First steps toward 3.0.0