Match model spec finished. Note, still some odd issues with fighter_a and fighter_b, will investigate