Adding 2 classes.  update design doc.