Tests 2 and 3 passing; 36 to go...