Begin to rework how lines are drawn - refs #10