First feature completed.

This is the code for the first feature of this sprint.