Added support for lines and colors. Organized.