Homework 3 v2

1st stab