Tons of Refactoring + Added Dyeing Machine