Started reviewing remainder of r/2188