Fixed TODOs
We change the way how we manage the choice. 
We can now choose between Attacks or Spells.