More icfp progress