That's a fair critique. I could keep it as "with" meaning "in addition to," but I think I'm going to adjust the wording slightly to make that one a bit clearer. AON isn't exactly a gimme, so it doesn't hurt to find another avenue to open up the puzzle. Thanks for the comment.
Yeah, even after I guessed that it had to be GEOM, I assumed that it must have been referring to geometry classes that sometimes include introductory bits for later subjects. The new wording is nice. Thanks!