Added circle, triangles not yet implemented