adding color handling
mostly there