Starting to add the full sketch support in the graphic part