More refactoring, line drawing, quads.