Continuing Refactor

Refining ability system
Continuing Refactor