Assignment 2

Committed for Peer Review (UPDATE: fixed minor, naming error)