Restructured, playing around with section types