starting to re-introduce Magic
Altered skill code

no longer requires switch statement for each skill