removed war stuff, moved to war_test branch