First stab at reorganziation of sections