Adds Magic and Battle choices

Also adds him/her selectivity