Added framework for class specific sections for #16