Feature/draw functionality