Start of major combat rewrite