Including homework 2 solutions, still missing 2.2