Beginning Feature #19

Beginning work on Feature #19