added incremental drawing
made everything work. Removed incremental drawing for now