working on combat resolution.  Also possible fix for an out of memory error