Added basic version of new Swatch class