Completed assignment 2 with comments