Add a whole bunch of sections, reorganize