Got combat mostly working

Got combat mostly working