Added swatch clearing function
added todo