Feature/2d

I think 2D plotting is ready to be added. I could use another person to look at it.