Added DrawPoint, which ties together all the point shapes into a convenient DrawShape