Finished first refactoring

Finished the refactoring to allow for scalability of the project.  If
desired more than 2 colors can be compared.