Add preliminary support for skins
Correct skinning