More reskinning work
Work on reskinning