massive refactor. pray
skill refactor pt1