Imported Sam's skinning work + clean-up