Added more section header stuff, but currently broken :(