Assignment 2 - First changes

Changes labeled with //DONE