more work on combat stuff...getting -somewhere- slowly...