Finished the draw algorithms for #75