got 2D solver working!