Finished the first part of the homework + comments