Assignment 2.1

Adds the feature you requested by way of