@cpennington You put the original assert in and did the refactoring of the fields to defer to their xmodule if given a descriptor, can you rule on this?