Work on refactoring skins