Lots of work on section 2