Surface template should allow the selection of any type of shapes, specially with holes.
A tool to add new holes post creation would be wonderful too
