Assignment 1.2 - Finished