Assignment 0 submission 2, with comments