Added more skills and making it easier to work with