Completed Assign 2

Crosses fingers on commit