Added comments, marked progress