Warrior refactored, druid fully working