Added color selecton...needs some work