Added set 17.  Updated 16.  Updated the template.

Signed-off-by: Jason Nicholson <jashale@yahoo.com>