Finished up to section 2.5