Agreed -- see comment below about working this into the Section model refactoring.