up to section 5.4 w/o all the cleannup