Finishing initial pass of shape-plotting function