Begins adding CHOICES to ClassSubject and ClassSection

see issue #1263