color logic
colors coming in now
conflicts resolved
conflicts resolved