Add cards Battering Ram, Trojan Priest. Tidy up some ifs