Added new AlternateValue subclasses to the forms (with JT)
Merge remote-tracking branch 'origin/master'