more work on getting 2D to work