Assignment 2 completed, with comments for functions