Adding color mapping
Refactoring data crunching