Big Commit, Worked on the AttackFactory (awesome name)