add skills
huge refactoring
need rebase..