WiP - Character skills refactor