cleaned up stuff, added 2D model