More commit, create soldier factory logic