More changes to ability system not quite done yet