2d finished (hopefully)