Change to list
Change skillset
Merge branch 'deadly_skills'