Assignment 1 - My solution