2.3 and 2.4 done (though graphs are too small)