Assignment 2 v0.4