Finished up to section 5.7