Finish up until section 6.3.2