refactor
removes by color, working on repopulating