Short assignment 2

Objectives completed (I think).