Progress on assignment #1