Added the color property and refactored the ToX methods
Added files
Included more unit tests