Add sections, move everything around