Added skills, doing a bit of refactoring