Add intersectins and shapes draft