Fix broken build, also work on converting everything into PassiveAbility